From: Peter Michael Green Date: Thu, 22 Jan 2026 06:53:46 +0000 (+0000) Subject: Manual merge of version 25.0.7-2+rpi1 and 25.3.3-1 to produce 25.3.3-1+rpi1 X-Git-Tag: archive/raspbian/25.3.3-1+rpi1^0 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=683f30783698814f288caca6578d4ed3570ce088;p=mesa.git Manual merge of version 25.0.7-2+rpi1 and 25.3.3-1 to produce 25.3.3-1+rpi1 --- 683f30783698814f288caca6578d4ed3570ce088 diff --cc debian/changelog index 122bee225,f81d4a16d..8ea03a747 --- a/debian/changelog +++ b/debian/changelog @@@ -1,10 -1,211 +1,219 @@@ - mesa (25.0.7-2+rpi1) trixie-staging; urgency=medium ++mesa (25.3.3-1+rpi1) forky-staging; urgency=medium + + [changes brought forward from 24.0.7-1+rpi1 by Peter Michael Green at Fri, 24 May 2024 10:55:59 +0000] + * Try to disable valgrind. + * Move valgrind from build-depends to build-conflicts. + - -- Peter Michael Green Fri, 29 Aug 2025 00:48:10 +0000 ++ -- Peter Michael Green Thu, 22 Jan 2026 06:52:47 +0000 ++ + mesa (25.3.3-1) unstable; urgency=medium + + [ Timo Aaltonen ] + * New upstream release. + + [ Simon McVittie ] + * Use the upstream solution for #980148 + + -- Timo Aaltonen Wed, 07 Jan 2026 14:26:39 +0200 + + mesa (25.3.2-2) unstable; urgency=medium + + [ Mario Limonciello (AMD) ] + * Add missing comma for provides (Closes: #1123627) + + -- Timo Aaltonen Fri, 19 Dec 2025 07:54:35 +0200 + + mesa (25.3.2-1) unstable; urgency=medium + + [ Timo Aaltonen ] + * New upstream release. + * control: Specify versioned build-depends for cbindgen and libx11. + + [ Mario Limonciello (AMD) ] + * Merge mesa-va-drivers and mesa-vdpau-drivers into mesa-libgallium (LP: #2135270) + * Drop conflicts on mesa-va-drivers and mesa-vdpau-drivers + + -- Timo Aaltonen Thu, 18 Dec 2025 19:03:53 +0200 + + mesa (25.3.1-1) experimental; urgency=medium + + * New upstream release. + * control, rules: Migrate to llvm 21. + * control: Make mesa-va-drivers replace mesa-vdpau-drivers, as it's + functionally more or less the same. + * signing-key.asc: Updated to silence uscan. + + -- Timo Aaltonen Mon, 08 Dec 2025 18:54:43 +0200 + + mesa (25.3.0-1) experimental; urgency=medium + + * New upstream release. + * control: Bump wayland-protocols build-dep. + * watch: Fixed. + + -- Timo Aaltonen Mon, 17 Nov 2025 17:12:32 +0200 + + mesa (25.3.0~rc4-1) experimental; urgency=medium + + * New upstream release candidate. + * rules: Enable anti-lag and screenshot vulkan layers. + * control: Limit rocket to arm64. + * Wrap-and-sort. + * control: Add libpng-dev build-dep for screenshot vulkan layer. + * mesa-vulkan-drivers: Add mesa-screenshot-control.py. + * mesa-vulkan-drivers.lintian-overrides: Updated. + + -- Timo Aaltonen Fri, 07 Nov 2025 12:54:12 +0200 + + mesa (25.3.0~rc2-1) experimental; urgency=medium + + * New upstream release candidate. + * rules: Add rocket gallium driver for arm. (Closes: #1118656) + + -- Timo Aaltonen Fri, 24 Oct 2025 21:38:08 +0300 + + mesa (25.3.0~rc1-1) experimental; urgency=medium + + * New upstream release candidate. + * watch: Update to version 5. + * patches: Drop upstreamed patches. + * control: Bump build-dep on directx-headers-dev. + * rules: Add a script to rewrite local rust subprojects to use the + distro registry. + * control, rules: Drop mesa-vdpau-drivers, VDPAU got removed upstream. + + -- Timo Aaltonen Tue, 21 Oct 2025 18:22:18 +0300 + + mesa (25.2.8-2) unstable; urgency=medium + + * disable-ccs-for-intel-xe2.diff: Dropped, fixed upstream. + + -- Timo Aaltonen Thu, 04 Dec 2025 15:45:54 +0200 + + mesa (25.2.8-1) unstable; urgency=medium + + * New upstream release. + + -- Timo Aaltonen Thu, 04 Dec 2025 15:39:40 +0200 + + mesa (25.2.7-1) unstable; urgency=medium + + * New upstream release. + * control: Build-depend on spirv-tools-dev. + + -- Timo Aaltonen Fri, 14 Nov 2025 15:48:09 +0200 + + mesa (25.2.6-1) unstable; urgency=medium + + * New upstream release. + * patches: Drop renaming of rsqrtf, upstreamed. + * patches: Disable CCS for Intel Xe2. (LP: #2127717) + + -- Timo Aaltonen Thu, 30 Oct 2025 11:38:42 +0200 + + mesa (25.2.5-1) unstable; urgency=medium + + * New upstream release. + + -- Timo Aaltonen Thu, 16 Oct 2025 13:15:22 +0300 + + mesa (25.2.4-1) unstable; urgency=medium + + * New upstream release. + + -- Timo Aaltonen Fri, 03 Oct 2025 18:09:21 +0300 + + mesa (25.2.3-1) unstable; urgency=medium + + * New upstream release. (LP: #2122654) + * patches: Fix crash on intel xe with 16kB page size. (Closes: #1115467) + + -- Timo Aaltonen Thu, 18 Sep 2025 11:08:11 +0300 + + mesa (25.2.2-1) unstable; urgency=medium + + [ Simon McVittie ] + * d/merge-vulkan-driver-manifests.sh: Remove library_arch from JSON manifests + (Closes: #1110523) (LP: #2121980) + + [ Timo Aaltonen ] + * New upstream release. + * patches: Fix FTBFS with glibc 2.42. + + -- Timo Aaltonen Thu, 04 Sep 2025 08:44:46 +0300 + + mesa (25.2.1-2) unstable; urgency=medium + + * control, rules: Revert back to llvm-19 as -20 is not in unstable + yet. + + -- Timo Aaltonen Thu, 28 Aug 2025 17:34:14 +0300 + + mesa (25.2.1-1) unstable; urgency=medium + + [ Timo Aaltonen ] + * New upstream release. + * rules: Don't clean up .pc dir. (Closes: #1111295) + * control, rules: Drop quilt again, unnecessary now. + + [ Fabio Pedretti ] + * rules: Disable sse2 disabling on i386. + + -- Timo Aaltonen Fri, 22 Aug 2025 14:01:57 +0300 + + mesa (25.2.0-1) experimental; urgency=medium + + * New upstream release. + * patches: Drop upstreamed and obsolete bits. + * Drop libd3dadapter9*, gallium-nine is no more. + * Drop libxatracker*, gallium-xa is gone. + * Drop libMesaOpenCL from mesa-opencl-icd, clover is gone. + * control: Bump meson and bindgen build-deps, add librust-rustc-2-hash-dev + for nvk. + * libegl-mesa0.symbols: Updated. + * rules: Drop shared-glapi build option, it's deprecated and doesn't + do anything. + * rules: Restore quilt, as source3.0 applies patches when building the + source. + * rules: Enable iris/anv on arm64 & ppc64el. (Closes: #1100537) + * rules: intel-clc is gone. + * rules: Enable iris/anv on riscv64. (Closes: #1108849) + + -- Timo Aaltonen Thu, 07 Aug 2025 14:08:04 +0300 + + mesa (25.1.7-1) experimental; urgency=medium + + * New upstream release. + + -- Timo Aaltonen Mon, 04 Aug 2025 08:56:31 +0300 + + mesa (25.1.5-1) experimental; urgency=medium + + [ Jianfeng Liu ] + * d/rules: Enable iris and intel vulkan driver for loong64 + + [ Timo Aaltonen ] + * New upstream release. + + -- Timo Aaltonen Thu, 03 Jul 2025 18:43:48 +0300 + + mesa (25.1.4-1) experimental; urgency=medium + + * New upstream release. + * patches: Drop upstreamed patches. + + -- Timo Aaltonen Thu, 19 Jun 2025 10:00:29 +0300 + + mesa (25.1.0-1) experimental; urgency=medium + + * New upstream release. + * rules: Enable asahi. (Closes: #1102725) + * Drop libosmesa*, removed upstream. + * libgbm-dev.install: Updated. + * libglx-mesa0.symbols: Updated. + * rules: Migrate to llvm-20. + + -- Timo Aaltonen Mon, 19 May 2025 16:10:14 +0300 mesa (25.0.7-2) unstable; urgency=medium diff --cc debian/control index a1b73d782,2be70dc64..aa4f4b753 --- a/debian/control +++ b/debian/control @@@ -37,36 -45,25 +45,26 @@@ Build-Depends libxrandr-dev, libxshmfence-dev (>= 1.1), libxtensor-dev [linux-arm64], + libxxf86vm-dev, libzstd-dev, + linux-libc-dev (>= 2.6.31) [linux-any], + llvm-21-dev [amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x sparc64 x32], + llvm-spirv-21 [amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x x32], + meson (>= 1.7.0), + pkgconf, python3, python3-mako, - python3-ply, - python3-yaml, python3-pycparser [arm64 armhf], python3-setuptools, - flex, - bison, - libelf-dev [amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x sparc64 x32], - libwayland-dev (>= 1.15.0) [linux-any], - libwayland-egl-backend-dev (>= 1.15.0) [linux-any], - llvm-19-dev [amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x sparc64 x32], - libclang-19-dev [amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x sparc64 x32], - libclang-cpp19-dev [amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x sparc64 x32], - libclc-19-dev [amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x sparc64 x32], - libclc-19 [amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x sparc64 x32], - wayland-protocols (>= 1.38), + python3-yaml, ++ wayland-protocols (>= 1.41), + zlib1g-dev, - libglvnd-core-dev (>= 1.3.2), rustc (>= 1.78) [amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x x32], rustfmt [amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x x32], - bindgen (>= 0.66.1~) [amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x x32], - cbindgen [amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x x32], - llvm-spirv-19 [amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x x32], - libllvmspirvlib-19-dev [amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x sparc64 x32], - librust-paste-dev [amd64 arm64 armhf i386 ppc64 riscv64 x32], - librust-syn-dev (>= 2.0.48) [amd64 arm64 armhf i386 ppc64 riscv64 x32], + spirv-tools-dev (>= 2024.4~rc1) [amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x sparc64 x32], - valgrind [amd64 arm64 armhf i386 mips64el powerpc ppc64 ppc64el s390x], - wayland-protocols (>= 1.41), - x11proto-dev, - zlib1g-dev ++ x11proto-dev +Build-Conflicts: + valgrind [amd64 arm64 i386 mips64el powerpc ppc64 ppc64el s390x], Rules-Requires-Root: no Vcs-Git: https://salsa.debian.org/xorg-team/lib/mesa.git Vcs-Browser: https://salsa.debian.org/xorg-team/lib/mesa diff --cc debian/control.in index ae5a70422,d85d555c3..c0f84ad09 --- a/debian/control.in +++ b/debian/control.in @@@ -37,36 -45,25 +45,26 @@@ Build-Depends libxrandr-dev, libxshmfence-dev (>= 1.1), libxtensor-dev [linux-arm64], + libxxf86vm-dev, libzstd-dev, + linux-libc-dev (>= 2.6.31) [linux-any], + llvm-@LLVM_VERSION@-dev [@LLVM_ARCHS@], + llvm-spirv-@LLVM_VERSION@ [@RUSTICL_ARCHS@], + meson (>= 1.7.0), + pkgconf, python3, python3-mako, - python3-ply, - python3-yaml, python3-pycparser [arm64 armhf], python3-setuptools, - flex, - bison, - libelf-dev [@LLVM_ARCHS@], - libwayland-dev (>= 1.15.0) [linux-any], - libwayland-egl-backend-dev (>= 1.15.0) [linux-any], - llvm-@LLVM_VERSION@-dev [@LLVM_ARCHS@], - libclang-@LLVM_VERSION@-dev [@LLVM_ARCHS@], - libclang-cpp@LLVM_VERSION@-dev [@LLVM_ARCHS@], - libclc-@LLVM_VERSION@-dev [@LLVM_ARCHS@], - libclc-@LLVM_VERSION@ [@LLVM_ARCHS@], - wayland-protocols (>= 1.38), + python3-yaml, ++ wayland-protocols (>= 1.41), + zlib1g-dev, - libglvnd-core-dev (>= 1.3.2), rustc (>= 1.78) [@RUSTICL_ARCHS@], rustfmt [@RUSTICL_ARCHS@], - bindgen (>= 0.66.1~) [@RUSTICL_ARCHS@], - cbindgen [@RUSTICL_ARCHS@], - llvm-spirv-@LLVM_VERSION@ [@RUSTICL_ARCHS@], - libllvmspirvlib-@LLVM_VERSION@-dev [@LLVM_ARCHS@], - librust-paste-dev [@NVK_ARCHS@], - librust-syn-dev (>= 2.0.48) [@NVK_ARCHS@], + spirv-tools-dev (>= 2024.4~rc1) [@LLVM_ARCHS@], ++ x11proto-dev +Build-Conflicts: valgrind [@VALGRIND_ARCHS@], - wayland-protocols (>= 1.41), - x11proto-dev, - zlib1g-dev Rules-Requires-Root: no Vcs-Git: https://salsa.debian.org/xorg-team/lib/mesa.git Vcs-Browser: https://salsa.debian.org/xorg-team/lib/mesa diff --cc debian/rules index 4ac7719aa,e461732ce..dbad8bd42 --- a/debian/rules +++ b/debian/rules @@@ -54,8 -52,7 +52,7 @@@ confflags_TEFLON = -Dteflon=fals LLVM_ARCHS = amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x sparc64 x32 RUSTICL_ARCHS = amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x x32 NVK_ARCHS = amd64 arm64 armhf i386 ppc64 riscv64 x32 -VALGRIND_ARCHS = amd64 arm64 armhf i386 mips64el powerpc ppc64 ppc64el s390x +VALGRIND_ARCHS = amd64 arm64 i386 mips64el powerpc ppc64 ppc64el s390x - WINE_ARCHS = amd64 arm64 armel armhf i386 # hurd doesn't do direct rendering ifeq ($(DEB_HOST_ARCH_OS), hurd)